c-chengc1
e83f1317a4
# Conflicts: # src/main/resources/views/platform/zhghh5/democratic/proposal/query/comprehensive/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/commissioner/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/delegation/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/feedbackEvaluation/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/mine/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/schoolLeaderApproval/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/seconded/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/suggestion/index.html # src/main/resources/views/platform/zhghh5/democratic/proposal/transact/unitReply/index.html