Merge branch 'dev_wy' into dev2.0

 {
 {
-  "navigationBarTitleText": "预扣预缴"
+  "navigationBarTitleText": "收入"
 }
 }

@@ -10,8 +10,8 @@
         <image class="icon_wrap" src="/images/tax_person.png"></image>
         <image class="icon_wrap" src="/images/tax_person.png"></image>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
-          <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>本人和家庭信息</text>
-          <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>本人和家庭成员的基本信息</text>
+          <text style='font-size: 36rpx;color: #000;font-weight:bold;text-align: left;'>个人和家庭信息</text>
+          <text style='font-size:28rpx;color: #999;text-align: left;margin-top:6rpx'>个人和家庭成员的基本信息</text>
         </view>
         </view>
         <image class='arrow_wrap' src='/images/arrow_right.png'></image>
         <image class='arrow_wrap' src='/images/arrow_right.png'></image>
       </view>
       </view>
@@ -21,7 +21,7 @@
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>专项附加扣除</text>
-          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>本人的专项附加扣除信息</text>
+          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>个人的专项附加扣除信息</text>
         </view>
         </view>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
       </view>
@@ -31,7 +31,7 @@
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='width:1px;height:140rpx;background-color:#e5e5e5;margin-left:40rpx'></view>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
         <view style='display:flex;flex-direction: column;width:440rpx;margin-left:30rpx;align-self:center;'>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>收入</text>
           <text style='font-size: 36rpx;color: #000;font-weight:bold;'>收入</text>
-          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>本人的收入和个税明细</text>
+          <text style='font-size:28rpx;color: #999;margin-top:6rpx'>个人的收入和个税明细</text>
         </view>
         </view>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
         <image class='arrow_wrap float_right' src='/images/arrow_right.png'></image>
       </view>
       </view>

 {
 {
-  "navigationBarTitleText": "自然人基础信息",
+  "navigationBarTitleText": "个人基础信息",
   "navigationBarTextStyle": "black",
   "navigationBarTextStyle": "black",
   "navigationBarBackgroundColor": "#FFFFFF"
   "navigationBarBackgroundColor": "#FFFFFF"
 }
 }

 {
 {
-  "navigationBarTitleText": "员工薪助手"
+  "navigationBarTitleText": "个人和家庭信息"
 }
 }