Merge remote-tracking branch 'origin/master'

ruoyi-activiti/src/main/java/com/ruoyi/activiti/domain/BizCreditReport.java

@@ -18,7 +18,7 @@ public class BizCreditReport extends ProcessEntity
     private static final long serialVersionUID = 1L;
 
     /** 主键ID */
-    private Long id;
+    private Long id
 
     /** 申请人ID */
     @Excel(name = "申请人ID")

ruoyi-supplies/src/main/java/com/ruoyi/system/controller/ActSuppliesRoleDetailController.java

@@ -21,7 +21,7 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * 规则详情Controller
  *
  * @author dongjg
- * @date 2023-07-12
+ * @date 2023-07-13
  */
 @RestController
 @RequestMapping("/system/suppliesroledetail")

ruoyi-supplies/src/main/java/com/ruoyi/system/mapper/ActSuppliesRoleDetailMapper.java

@@ -10,7 +10,7 @@ import com.ruoyi.system.domain.ActSuppliesRoleDetail;
  * 规则详情Mapper接口
  * 
  * @author dongjg
- * @date 2023-07-12
+ * @date 2023-07-13
  */
 public interface ActSuppliesRoleDetailMapper 
 {

ruoyi-supplies/src/main/java/com/ruoyi/system/service/IActSuppliesRoleDetailService.java

@@ -11,7 +11,7 @@ import com.ruoyi.system.domain.ActSuppliesRoleDetail;
  * 规则详情Service接口
  * 
  * @author dongjg
- * @date 2023-07-12
+ * @date 2023-07-13
  */
 public interface IActSuppliesRoleDetailService 
 {

ruoyi-supplies/src/main/java/com/ruoyi/system/service/impl/ActSuppliesRoleDetailServiceImpl.java

@@ -18,7 +18,7 @@ import com.ruoyi.system.service.IActSuppliesRoleDetailService;
  * 规则详情Service业务层处理
  *
  * @author dongjg
- * @date 2023-07-12
+ * @date 2023-07-13
  */
 @Service
 public class ActSuppliesRoleDetailServiceImpl implements IActSuppliesRoleDetailService

ruoyi-ui/src/views/system/supplies/index_template.vue

@@ -219,6 +219,8 @@ export default {
       showSearch: true,
       // 总条数
       total: 0,
+      // 状态数据字典
+      statusOptions: [],
       // Excel模板表格数据
       SuppliesTemplateList: [],
       //模板详情