Merge branch '2.0.0' of http://git.ycjcjy.com/fuxingfan/smartCommunity into 2.0.0

CODE/smart-community/app-api/src/main/resources/mapper/TpTransactionReplyMapper.xml

@@ -177,7 +177,7 @@
         AND  tr.ta_user_id = #{founderUserID}
       </if>
       <if test="type == 0" >
-        AND (tr.ta_user_id = #{founderUserID}) OR (tr.reply_ta_user_id = #{founderUserID})
+        AND (tr.ta_user_id = #{founderUserID} OR tr.reply_ta_user_id = #{founderUserID})
       </if>
    </select>
    <select id="selectUserTransactionReply" resultMap="BaseResultMap">

VUECODE/smart-operate-manage/src/views/phoneconfig/phoneconfigAdd.vue

@@ -44,7 +44,7 @@ export default {
           { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
         ],
         remark: [
-          { required: true, message: '请选择角色', trigger: 'blur' }
+          { required: false, message: '请输入备注', trigger: 'blur' }
         ]
       }
     }

VUECODE/smart-operate-manage/src/views/phoneconfig/phoneedit.vue

@@ -44,7 +44,8 @@ export default {
           { min: 11, max: 11, required: true, message: '请输入11位手机号', trigger: 'blur' }
         ],
         remark: [
-          { required: true, message: '请输入备注', trigger: 'blur' }
+          { required: false, message: '请输入备注', trigger: 'blur' }
+
         ]
       }
     }