Merge branch 'dev_wy' into 机器人dev

wangyu
pages/main/addtionalreduce/additiondetail/additiondetail.wxml
--- a/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @b508f54
+++ b/pages/main/addtionalreduce/additiondetail/additiondetail.wxml
查看文件 @b508f54
@@ -52,7 +52,7 @@
         <text class='text_left'>受教育时间止</text>
         <text class='text_right_333'>{{datas.education_end}}</text>
       </view>
-      <view wx:if="{{datas.education_end&&datas.education_end.length>1}}" style='height:90rpx;width:100%;clear:both;'>
+      <view wx:if="{{datas.education_period_end&&datas.education_period_end.length>1}}" style='height:90rpx;width:100%;clear:both;'>
         <text class='text_left'>教育终止时间</text>
         <text class='text_right_333'>{{datas.education_period_end}}</text>
       </view>