Merge branch 'dev' into build

# Conflicts:
#	package.json
#	project/dv/apps/AppGridDV.vue

packages/conv/creditScore/AppGridMemberScore/components/gridScoreDetail.vue

@@ -49,7 +49,7 @@
           <el-table-column slot="changeIntegral" label="变动积分" align="center">
             <template slot-scope="{ row }">
               <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
-              <span v-if="row.integralType == 0">{{ row.changeIntegral > 0 ? '+' : '-' }}{{ row.changeIntegral }}</span>
+              <span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="integralType" label="类型" align="center">

packages/conv/creditScore/AppGridMemberScore/components/gridScoreStatistics.vue

@@ -87,7 +87,7 @@
           <el-table-column slot="changeIntegral" label="积分变动" align="center">
             <template slot-scope="{ row }">
               <span v-if="row.integralType == 3">{{ row.changeIntegral | formatTime }}</span>
-              <span v-if="row.integralType == 0">{{ row.changeIntegral > 0 ? '+' : '-' }}{{ row.changeIntegral }}</span>
+              <span v-if="row.integralType == 0">{{ row.integralCalcType == 0 ? '-' : '+' }}{{ row.changeIntegral }}</span>
             </template>
           </el-table-column>
           <el-table-column slot="options" label="操作"  align="center">

packages/wxwork/Announce/AppAnnounce/components/Add.vue

@@ -391,7 +391,8 @@ export default {
               return {
                 ...v,
                 wxOpenUserId: v.examineUserId,
-                id: v.examineUserId
+                id: v.examineUserId,
+                name: v.examineUserName
               }
             })
             this.form.examinesName = '1'