Merge branch 'dev' of http://39.105.222.208:1024/compliance_management/ruoyi-flowable-plus into dev

# Conflicts:
#	ruoyi-system/src/main/java/com/ruoyi/compliancemanagement/controller/TblContractController.java

@@ -148,6 +148,7 @@ public class TblContractController extends BaseController {
             variables.put("contractName",bo.getContractName());
             variables.put("contractName",bo.getContractName());
             // 合同类型
             // 合同类型
             variables.put("contractType",bo.getContractType());
             variables.put("contractType",bo.getContractType());
+//            variables.put("contractType",Long.valueOf(bo.getContractType()));
             // 合同金额
             // 合同金额
             variables.put("contractAmount", bo.getContractAmount());
             variables.put("contractAmount", bo.getContractAmount());
             // 生效日期
             // 生效日期