Merge branch 'master' into 3.0

# Conflicts:
#	cost-service/src/main/java/com/blt/other/module/cost/dto/request/AppCheckCostListReq.java
#	cost-service/src/main/java/com/blt/other/module/cost/model/CostDomain.java
#	cost-service/src/main/resources/mapper/Cost.xml

cost-interfaces/src/main/java/com/bailuntec/cost/api/dto/CostDto.java

@@ -226,4 +226,6 @@ public class CostDto {
     @TableField(exist = false)
     private CostTemplateDto costTemplate;
 
+    private Boolean isPic;
+
 }

cost-service/src/main/java/com/blt/other/module/cost/controller/CostDetailController.java

@@ -73,6 +73,7 @@ public class CostDetailController {
                                 || user.getUseraccount().equals("罗贞")
                                 || user.getUseraccount().equals("陈文静")
                                 || user.getUseraccount().equals("林冬菊")
+                                || user.getUseraccount().equals("梁献云")
                                 || detail.getCreateUsername().equals(user.getUseraccount()))) {
                     detail.setFilePath("");
                 }