Merge remote-tracking branch 'origin/dev' into dev

peng

8 天以前 62b3e99c68eb75a2c5cd86eb748534bd266ad009

 framework/src/main/java/cn/lili/modules/lmk/domain/form/ActivityAuditRecordForm.java

@@ -49,14 +49,14 @@
        return entity;
    }

    public static ActivityAuditRecordForm getEntityByManagerBuildForm(@NotNull String activityId) {
    public static ActivityAuditRecordForm getFormByManager(@NotNull String activityId) {
        ActivityAuditRecordForm form = new ActivityAuditRecordForm();
        form.setActivityId(activityId);
        form.setAudit(1);
        form.setRemarks(mangerBuild);
        return form;
    }
    public static ActivityAuditRecordForm getEntityByBuyerBuildForm(@NotNull String activityId) {
    public static ActivityAuditRecordForm getFormByBuyer(@NotNull String activityId) {
        ActivityAuditRecordForm form = new ActivityAuditRecordForm();
        form.setActivityId(activityId);
        form.setAudit(0);